From 7009511a224b15f26e91d4fbf42ce9bbf5f013d1 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 8 Jun 2001 19:03:23 +0000 Subject: [PATCH] added this function 2001-06-08 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this function * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added this function --- ChangeLog | 10 ++++++++- ChangeLog.pre-2-0 | 10 ++++++++- ChangeLog.pre-2-10 | 10 ++++++++- ChangeLog.pre-2-2 | 10 ++++++++- ChangeLog.pre-2-4 | 10 ++++++++- ChangeLog.pre-2-6 | 10 ++++++++- ChangeLog.pre-2-8 | 10 ++++++++- docs/reference/gtk/tmpl/gtk-unused.sgml | 9 ++++++++ docs/reference/gtk/tmpl/gtkcontainer.sgml | 10 --------- docs/reference/gtk/tmpl/gtkrc.sgml | 1 + gtk/gtktextbuffer.c | 22 +++++++++++++++++++- gtk/gtktextbuffer.h | 2 ++ gtk/gtktextiter.c | 8 +++++--- gtk/gtktextview.c | 25 +++++++++++++++++++++++ gtk/gtktextview.h | 3 ++- 15 files changed, 128 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c0cfe00bb0..d843b42537 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-06-08 Havoc Pennington + + * gtk/gtktextbuffer.c (gtk_text_buffer_get_start_iter): added this + function + + * gtk/gtktextview.c (gtk_text_view_get_default_attributes): added + this function + 2001-06-08 Alex Larsson * gtk/gtkcompat.h.in: @@ -5,7 +13,7 @@ Fixes bug #52892 2001-06-08 Havoc Pennington - + * gtk/gtkhsv.h (struct _GtkHSVClass): had GtkContainerClass as parent still diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 85536fc79b..ae135db43f 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1005,6 +1005,15 @@ is enabled. @colorsel: @use_palette: + + + + + +@container: +@direction: +@Returns: + This function is not usually used by users. diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index c3e926c6ed..4632a7f11b 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -101,16 +101,6 @@ GtkContainer @Returns: - - - - - -@container: -@direction: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index e6727ce356..244dd09a1b 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -495,6 +495,7 @@ This can later be composited together with other #GtkRcStyle structures to form a #GtkStyle. +@parent_instance: @name: @bg_pixmap_name: @font_desc: diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 4de2827fcc..961fbf0633 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -2324,6 +2324,26 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer, _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset); } +/** + * gtk_text_buffer_get_start_iter: + * @buffer: a #GtkTextBuffer + * @iter: iterator to initialize + * + * Initialized @iter with the first position in the text buffer. This + * is the same as using gtk_text_buffer_get_iter_at_offset() to get + * the iter at character offset 0. + * + **/ +void +gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer, + GtkTextIter *iter) +{ + g_return_if_fail (iter != NULL); + g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); + + _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, 0); +} + /** * gtk_text_buffer_get_end_iter: * @buffer: a #GtkTextBuffer @@ -2333,7 +2353,7 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer, * character in the text buffer. If dereferenced with * gtk_text_iter_get_char(), the end iterator has a character value of * 0. The entire buffer lies in the range from the first position in - * the buffer (call gtk_text_buffer_get_iter_at_offset() to get + * the buffer (call gtk_text_buffer_get_start_iter() to get * character position 0) to the end iterator. * **/ diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index 4368d242aa..bfaafd2206 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -296,6 +296,8 @@ void gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer, void gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer, GtkTextIter *iter, gint line_number); +void gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer, + GtkTextIter *iter); void gtk_text_buffer_get_end_iter (GtkTextBuffer *buffer, GtkTextIter *iter); void gtk_text_buffer_get_bounds (GtkTextBuffer *buffer, diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 9702a0b570..ae7dfecf11 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1629,12 +1629,14 @@ gtk_text_iter_get_bytes_in_line (const GtkTextIter *iter) * * Computes the effect of any tags applied to this spot in the * text. The @values parameter should be initialized to the default - * settings you wish to use if no tags are in effect. + * settings you wish to use if no tags are in effect. You'd typically + * obtain the defaults from gtk_text_view_get_default_attributes(). + * * gtk_text_iter_get_attributes () will modify @values, applying the * effects of any tags present at @iter. If any tags affected @values, - * the function returns TRUE. + * the function returns %TRUE. * - * Return value: TRUE if @values was modified + * Return value: %TRUE if @values was modified **/ gboolean gtk_text_iter_get_attributes (const GtkTextIter *iter, diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 99da996ca5..c90d2d0b58 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -4410,6 +4410,31 @@ gtk_text_view_ensure_layout (GtkTextView *text_view) } } +/** + * gtk_text_view_get_default_attributes: + * @text_view: a #GtkTextView + * + * Obtains a copy of the default text attributes. These are the + * attributes used for text unless a tag overrides them. + * You'd typically pass the default attributes in to + * gtk_text_tag_get_attributes() in order to get the + * attributes in effect at a given text position. + * + * The return value is a copy owned by the caller of this function, + * and should be freed. + * + * Return value: a new #GtkTextAttributes + **/ +GtkTextAttributes* +gtk_text_view_get_default_attributes (GtkTextView *text_view) +{ + g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), NULL); + + gtk_text_view_ensure_layout (text_view); + + return gtk_text_attributes_copy (text_view->layout->default_style); +} + static void gtk_text_view_destroy_layout (GtkTextView *text_view) { diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index 3455655d9d..66165b3dbf 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -316,8 +316,9 @@ gint gtk_text_view_get_indent (GtkTextView *text_vi void gtk_text_view_set_tabs (GtkTextView *text_view, PangoTabArray *tabs); PangoTabArray* gtk_text_view_get_tabs (GtkTextView *text_view); - +/* note that the return value of this changes with the theme */ +GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView *text_view); #ifdef __cplusplus } -- 2.30.2